From 6a7d903612a891c56b9f72ea2d5dc28eb9367d45 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Tue, 4 Jul 2017 11:35:06 +0200 Subject: [PATCH] sizerequest: Add more assertions for baselines min baselines must be <= natural baselines and both must lie inside the content size of the widget. --- gtk/gtksizerequest.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c index e1baaf1e73..0b1564edeb 100644 --- a/gtk/gtksizerequest.c +++ b/gtk/gtksizerequest.c @@ -305,6 +305,18 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget, min_baseline = -1; nat_baseline = -1; } + else if (min_baseline > reported_min_size || + nat_baseline > reported_nat_size || + min_baseline < 0 || + nat_baseline < 0) + { + g_warning ("%s %p reported baselines of minimum %d and natural %d, but sizes of " + "minimum %d and natural %d. Baselines must be inside the widget size.", + G_OBJECT_TYPE_NAME (widget), widget, min_baseline, nat_baseline, + reported_min_size, reported_nat_size); + min_baseline = -1; + nat_baseline = -1; + } else { if (css_min_size > reported_min_size) -- 2.30.2